Code cleanups (unix)