AppCode refactoring