For now I will leave them as they are, and would try to address this in a later commit.