Code cleaning & optimization.