formatting
cleaning up code