Neatened Format

Reorganized