Cleanup

Miscellaneous style fixes, updated README