Clean up code
Update README