refactors gef models