Made some code improvements.