Removing unused arguments and added comment