Cleaned up parsing
Added value indexing and separated op codes from operators