More style fixes and removing debug info