Style cleanup
Update README and CHANGELOG
Remove old stuff