Optimization and improvements. Ready to start coding