Minor tweak to reduce code and fix spacing issues.