Cleanup and improves