Cleanup code and update readme