major clean up

(minor refactor)