Code style changes
Removed unused cli arguments