Just a refactoring :) [Open review]