Refactored some variable and method names #4