Implement some of Lukas's suggested changes