Clean up, final version before overhaul