Small refractoring of core and layout