Apply formatting - didn't do full checkstyle cleanup yet.