AppleRun: Cleanup / Refactor / Bug fix