Addressed Code Analysis issues