cleaned up code/variable names