Removing useless arguments
Adding a Main