Cleanup: Remove unnecessary function
Cleanup: Move complexity to another function