Remove whitespace, add styles
Refactor click event