Refactor

A small sunday refactoring ;)