Remove unused OSX code; Fix indentation