Sprint 7 continued, comments added, unneeded classes removed