Better usability, removed redundant code