fix spaces and alignment