Cleaned up long options to be more reusable in future scripts