[TASK] Code cleanup
[TASK] Added todo for future improvements