One more code prettify + comments