Better variable names, simpler parser