Code formatting, cleanup. Fix readme.