Yes, I was trying for the Single Responsibility Principle, or something close. :)