Minor refactoring

Some variables and one method name changed