Just another refactor ;)