Comments now correctly placed