Tidy and comment yml