#14 clean after code review