Implemented feedback from instructor review