Tidy up / Comments
Minor fixes