Huge codeclean + efficiency