Change plurality of method call to be consistent and sane