Updated comments, moved methods and refactored URL params

@CarlosManias @markewallace

- Updated comments
- Refactored URLs
- Moved getters to top of class