Set tab-width to 4 spaces; Minor code cleanup