style+code conventions: cleaning up for next qa

- use current() to retrieve single records from list calls
- fix indentation issues
- move all get_class_name calls to top of method
- remove outdated/unnecessary TODO's