Cleaning up init logic around collections