Removed some Code Analysis issues