re-indent and cleanup