Freshened up the source code slightly