Minor refactor + small readme changes.