correcting style
more style corrections
merging