Minor tweaks for my personal style