Clean up whitespace and hash syntax
Clean up whitespace and hash syntax