Style cleanup and wrapping fixes
Remove unused attributes
Update documentation