Remove tabs and add arguments for more functionality.