Added/fixed comments and removed unused method