Cleanup & whitespace check