Cleaned up _getopt further