Adding tests
Simplifying some code
Small changes
Small changes
Small changes
Small changes
Small changes
Small changes