A little refactoring
Forgot internal module.