Managing data (1st version)
Code cleanup