Tweaks to coding style based on @michaelficarra's feedback.