Formatting cleanup
Removing needless code