#31 correct indentation and remove trailing spaces