angle little refactor