Small cleanups before CSS refactor