got rid of redundant arguments