Applying suggestions to code tweaks.