Clean Code

Signed-off-by: Andrey Shamis <lolnik@gmail.com>