Linter clean up and moved a module