Small task-related changes

Changes made to the code, to match the task objectives.