some small refactorings
user story 2 and 3