refactor semicolons and things