Format more code, fix some small bugs