Small changes and added comments