finished video 32 and 33 "refactoring, fixing error"