Tidying closure build