Refactoring

Removes more silliness than the seriousness it adds. This is public code, so let's get serious.