Re-organized code