More style changes, removed un-needed comments