Minor changes and beautified