Start cleaning up mess

- Get rid of unused/unnecessary methods
- Format throw error statements for readability
- Rename vars