Cleaned up the code base.