I introduced a constant to replace the magic number. Also by introducing new methods, some of theses calls have been pushed deeper. 

I haven't figured a good way to abstract the calls which were inside a block since that abstraction would have to be outside the block.