Did some refactoring of checks for android versions