Code formatting tweaks