cleanup, added meta-data, parameters