removed map-stream dependency from code
celaned up code a little
bumped version