Prepare for review, fix tabs