Update indentations, remove debug toolbar