Minor refactor & testing github