Removed unused method. Removed some comments and added some new ones