Fixed features to best practices

Change-Id: Iebbd8426bf7fec0a1dc92cf39ddc574157a23cef
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>