Ran code format
Removed dead code