Maybe this wasn't bloat after all

Closes #57