some style changes
fixed a merge error