it finally cleaned up here