Code analysis clean up. Read me updated