colorin: some code cleanup