Did some formating to fit the new code convention of 80 chars per line