Fix some typo of the previous commit
Improve code quality for folder viewer