some restructuring fixes
small fix