Refactoring done.

Signed-off-by: ICE <ice.sumy@gmail.com>