New solution & white-space clean-up