clean up the code base a bit