Small refactoring. Splitting up big method in small methods.
Split big method in small methods