Update readme, more code cleanup