Cleaning code, and comments,  Reforming Code to standard