chore(style): more style cleanups

Consistent white space, var assignments, semicolon usage