Minor refactoring changing method positioning and variable names