Web API Samples Refactor