Sanitize, some clean-up/organizing