reorganizing, adding some config
condensing and simplifying