Some simple cleanups + README improvements