Cleaned up argv options