Added a few comments and reformat files