Revert indentation take 2 + more checking