Minor refactor and commented out some snippets