Code formatting changes (for eclipse/PDT)