Code optimization
Airplay control point refactoring