Cleaning up/consolidating classes