first step refactoring
repare visual mode
remove unused comments