Print service refactoring