Code cleanup
Update README instructions