cleaned up code more

moar