spring cleaning and re-org