whitespace
elaborated on the todos