SP and comment spacing fix