Moved the comments to suit my style