Re-organized code.