cleanup

little refactor for clarity