Minor changes and updated comments