Client Side code refactoring

Created by: dzaporozhets