Cleanup & formatter