reorganize better