code review comments, cleanup Avatar constructor