Refactoring
Refactoring
Small fixes, need big update this class. Extract methods