I thought about that. For now I decided I'd keep this exactly as it is currently. Might make a follow up PR for this once this one is ready to be merged.