Making things a bit nicer