Formatting, clean up, more information, and better coding practices