Added previous formatting for a better review
removed deprecated comment