Refactoring XInt