Slight changes

Removed unused methods and tried to comply with CONTRIBUTING.md