Minor aesthetical tweaks