Further improvements on source code.