Cleanup build rules
Update README