Code improvement: unite jewel movement in swap and after successful match