Removed all of Robert's bad code and naming