Convert indentation to spaces
Remove old class