Code cleanup and documentation.
Remove useless wrapper class.