Refactor a bit more :)