Make parsing code a bit more readable
Fix dependencies