Added activation check to fix #8

Small format cleanup