Removed global METADATA dict (not super user-friendly) and several minor simplifications.