cleaning up arguement parsing