refactoring headers in some classes