Fix whitespaces and alignments