#13 - Changes from code review