Made some code cleanliness updates
Fixed bug with options not being available outside of the tasks scope