Fix formatting, cleanup, update readme, commit 300!