Code parsing improved