Refactoring on 16/06/2014 in order to aling with team members