[maintenance] Reduced Pointer Arrithmetic + Cleanup

KISS Principle: for sake of simplicity and better signal/slot compatibility