greatly reduced the number of warnings
Made the top level much less cluttered