#44 | fix issues from code review