Moved argument parsing from global scope