clean

cleaned up parts of the code