Develop review

Quick code review using IDE code inspector