Removed unnecessary code and improved argument format.
Fixed merge conflicts.