minor cleanup
prep work for timer gate / other gates