Cleanup and tweaking