Made few trivial changes