minor refacroting, starting Grape API next