Reformat some code. Remove some extra files.
Update README