- OSX refactoring