Performed cleanup and improved comments on some files