Made some minor changes in the source code