isp refactoring

by forshtreter@ & mokhov@