Added a few comments and did some housekeeping