Simplifying further the structure