Small changes for more readable and efficient code