refactoring
modify first letter
more evaluation