Cleaning up code base.