Make the install code more readable