code cleanup, reorganize interests