Minor refactor
More auto functions