Format
Remove commented code.
Format