[TASK] Code style
[TASK] Reviewed and partially rewritten whole code base