reorganize, cleanup