Новые требования к реализации ололо

Signed-off-by: SharplEr <SharplEr@gmail.com>
Some clean-up.

Signed-off-by: SharplEr <SharplEr@gmail.com>