Replace EMPTY by Object.empty
Add comments and line wraps