Remove extra spacing
Various coding style improvements
Remove duplicate branch