Cleanup & overhaul