Minor tweaks, considering I might use this again.