[WIP] - little refactoring