deployment line more friendly. Refactoring