Refactor parsing
Refactor variable names