made some style changes consistent with best cs syntax guide rules