syncing quick code cleanups