Exactly :) Good job for your refactoring :)