Some refactoring issues was done