Fix whitespace and headerline based on review comments