Layout cleaned up, ansi style function declarations.