Fix indentation lint issue, remove commented code