Re-structured code.