Cleanup and fix