minor refactors while waiting on api push.