minor cleanup and reduction of code (unneeded, but keeps code tight)