Tiny changes due to comments