Class cleanup

- Moved private, internal methods to the bottom
- Fixed a pragma directive