Code cleanup (public removed from interface and few comments updated)
Improved metadata interface for iteration through metadata