style: small codestyle and formatting improvements