minor spacing and consistency stuff