Cleanup, more improvements