Code formatting first pass
See #27