Better spacing
Notes and TODOs