Prepare for review, fix spaces