added comments
refactoring chapter
refactoring chapter
done refactoring chapter for now