Updated Sources to Match Google Coding Style