cleaning up whitespace and style