Refactoring more, OS X indicator seems to work