improving init order