Fixed whitespace matching; Aligned output;