Polished some more code issues.