Source code cleaned up.