Clean up yaml config; use inheritance to simplify