cleaned up a bunch of naming and spacing conventions