Completed task minor adjustements