Changes to indentation and excessive validation