oh get it.. you're right i could rename it :) and I will apply line too. 
Except this one, do you know if someone could help to create unit test? I am really overwhelmed about this point :/