Minor Changes to code