added more variables
cleaning up