cleanup: removed unused code, improved naming conventions