Polishing last commit, organizing imports

Signed-off-by: nickolayrusev <nickolay.rusev@gmail.com>