Organize the object better