First attempt at formatting the code.

Not ready for production... need to figure this one out first.