cleaned up the code base