lua
refactoring
cleanup