Add cleanup and cob, fix whitespace.