Cleanup & code syntax fix

Signed-off-by: Ivan Bilych <ivan.bilych@gmail.com>