Cleanup

Cleaned up, added abstract helper.