Cleanup and tweak