Contact section refactoring