Cleaned up For TWRP