Fixing indentation and adding labels