changed the parsing to be more readable