inf-1025 refactoring
inf-1025 commenting code