Cleaning code.
Internal methods to module methods.