All fixed
Merge branch 'task-5' into task-6
Fixes from storeable
Checkstyle