a little refactoring and optimization test