Done some minor modifications.