clean up; now a explicit key is needed to make code more readable