better whitespaces and comment