cleaned some method calls