Autoformatting of the code, removed commented code