Made it a bit nicer