Final Push One

Descriptive variables, refactoring