Little refactoring before fixing

- Removed unused methods
- constantized
- Ruby-ized / humanized