Code refactoring
New code.