Improved comments alignment