C: Code cleanup for UNIX