Fix tabs to spaces and include @jacopotarantino 2 questions