Tidy things up!

Tabbs and spacing adjusted.