Align and fix comments