style changes

Changed the formatting and variable naming according to Deans request.