Better go completion, easier to maintain