Small Refactoring

or a completely new website?