commented / cleaned up codebase