renamed function
cleaned up formatting
more formatting