did a little refactoring and notating