cleaned up project some more