misc minimal refactor (99% NLC)