Some refactorig
'