Merge pull request #3200 from eileenmcnaughton/code_tidy_up
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 5 Jun 2014 00:36:24 +0000 (12:36 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 5 Jun 2014 00:36:24 +0000 (12:36 +1200)
Code tidy up


Trivial merge