Refactored names and cleaned that shit up for john

The cum that is