Few small changes made