cleaning

cleaning up code for legible review