Feature/book 956

There is a mix of spaces and tabs here. We should use only spaces.