Add displayed property.
and remove logs, commments, etc...