Removed prints, added logging
Merge branch 'code-review' into develop