Removed unused arguments and sorted by name