cleanup, .lua simplification