Add missing return
Fix indentation
Test better suggestion manipulations