condense method cleanup