[cleanup] Better logging + applied codestyle
[cleanup] Applied codestyle