some more minor refactors
without non existant file require