Rohan, Vinay | #816 | Fixed the no of arguments, and refactored the script