minor re-formatting and clean up