Tweaks
Cleanup
Added tests