Some inital cleanup of the code base.