Minor changes

- Reverting #210 & #213 due to negative impact on performance from extra closures
- Updating README