renaming and a little bit refactoring.