Rename file
Update README
Clean up some logic