updated variable and method names - moved some stuff around