Restructure to make linter happy