fix collection fetching + code cleanup