clean up vars, remove some loc
compare builder ui