code reformatting / coding guidelines fixes