MacAgent translation, Android and refactoring