Code improvements after review
Iteration 2-3, other stories