Simplify function
Woops, fix unnecessary calls