Formatting the code
code clean up and more formatting