Altered some comments, deleted and modified, and deleted some 'main' methods