Cleaned up the argv attribute which isn't really needed or tested