Some needed code cleanup
Add README.md