Clean up whitespace and doc strings