First pass at line comment correctness