Merge "Cleaned up data enable code"