Bit more refactor
Refactor
Refactor
Refactor