Fix spaces and alignment