Code refactor
Code refactor part 2