Put stories in different rows
Remove a few lines of code
Add some mock MVC tests