Cleaning up whitespace and formatting