reorganize a few things