Changes to code

Small changes to code