Cleaned up some code and changed the size class to be a struct for easier value copying.