Cleaning up config so client has place for options