few more tweaks to overall structure