Fix: Dead code removed, comments added