a little refactoring and some more angular additions