Make a bit nicer
Refactor a bit