Enhanced whitespacing