cleaned up a lot of stuff for consistency