wip
formatting and cleanup