Code format + small fixes after code review made by Kuhar