Make parsing more clear