formatting update / cleanup