Cleaned up original variable parser