cleaned up code
a few more files