More readable and just need to change at one point