#57 | fix code review issues