Small code (comments and line-breaks) cleanup