Making code more readable
Fixing issue #4
Updating packkage json