Minor code formatting fixes
Unnecessary memset