Merge branch 'fix/refactor-after-reviews' into 'milestone-3'

refactor(): Some refactoring based on fellow students' feedback

See merge request !54