Updated minor changes to code