more formatting and cleanup