Small changes to make script more compact