Fixed up code to only use 80 chars/line

Also made use of 3-space tabs consistent.