Removed superfulous include
Base of public display
Removed yaml ambiguity