Cleaning up the code base a bit