#130 - Implemented code-walkthrough feedback