Normalized coding standards and removed unused local vars