cleaned up oins scaffold