changing from get/set methodology to a sub object with clean data