remove comments for readability
break up long lines