Remove commented code
Autoformat code