Clean up code, more classes