Better naming and comment columning