Neater Formatting

(somewhat) neater code as well...