Cleaned and optimized.