Cleaned up code, added additional enhancements for Android 4.4 KitKat.