removed OSX cruft, more prettyfying, code readable