Restructure to bring back inline