Improved note and whitespace