Cleanup of the files. Added several comments