Style consistency cleanup

Mostly an effort to get rid of semicolons