code reformatting
supressed warning
some cleanup