Some extra tweaks for the code style