minor changes into code