Simplify interface & logic, rename module, lint