changing method implementation
method cleanup