TASK: changes to match coding guidelines