de-clutter some of the main stuff