code and api cleanup - yaml in