cleaned up more code, if I keep this up nothing will be left