Tidy whitespace and comments. Remove extraneous interrupt code