More style changes, starting to clean up code for release