fix return to one liner
Add trait feature