lesson - refactoring complete (kind of)
After lesson