(misc) Organized code