Add descriptive comments & extra folds