WIP clean up/reformatting