Moves keyword parsing to own module