cleaned up code style

No new dinosaurs, but I did clean up the code style.

I verified that it runs on my Moto X

@oalami please review