Cleanup, indentation...