Exteracted methods to clean up code
DFix