Added some doc strings
Improved data loading