Made some other minor changes to source code