Feature/226/update feature style