Style fixes, remove Kim’s old code.

Closes #51