Improved keyword pretty print commenting