Refactoring

Removes more silliness than the seriousness it adds