Reduced unnecessary calculations