formatting and cleanup.