remove excess new lines
fix missing semicolon and newline
general cleanup
update tests for new spacing
version bump to 2.4