Code refactored so that variable names apply to this project