Style: Small tweaks here and there