restore chefvm and reindent for style