@demet19 @kilofoxx started refactoring