Cleanup of some methods.  Prefixin'