Re-arrange suggestions methods
Small style fixes for suggestions