Cleaning up box class code