Several readme changes and code style