#126 removes spaces and corrects details