Small changes in code + comments