Made a bit nicer