Start to work on devices creation.
Start to work on devices creation.
Small cleanup.