Finish initial parsing code