cleaned up the code bit
by fixing a few formatting isssues and a few other things