Update indent to 2 tabs
Update code style and other cosmetic issues