Next boring refactoring - but awesome one