Craig: Removing more unecessary stuff, making names easier to use