Making some parts a bit nicer