cleaning up source code.