removes some semi-colons, cleans up a few functions