Minor refactor & README update