OPT: clean code