Cosmetic change and remove useless whitespace