Altered class, cleaned up processing