Finish style cleanup