Updates to clean up whitespace