Formatted Code a little more nicely and added more headers