refactor, cleaning up the clutter
refactor
cleaning up
formatting, add remove curl