StatHat rename and code cleanup

Fixes #33