Reafactor/small improvements #287

Closed yurykurouski closed 5 months ago