refactor static errors
Static test with xcode analyzer
fix conflict