Use cleaner yaml style