code reformatting and cleanup