Better function organization