Clean up comments and rework data property
0.0.9