Cleaning-up whitespace