cleaning up whitespace and superfluous comments