removed redundant parameters in methods