Cleaning up classes yo