Cleaned up refactors for Data Class.