Bunch of cleanup, style changes, etc.