Insert is more stable + Comments + Short cleanup