Implemented changes from code review AA-3