Misc
- Cleaned up code
- Added methods to set handlers(Useful for API, maybe?)