trying to clean up code
cleaning up code