Cleanup, init

trying to use __init, changed to new style key scan (k in m)