Few code refactoring ...