Formatting and added the good stuff

added the correct formatting and cleaned up the code.