improve inheritance, remove dummy file