Make changes based of suggestions by Kevlin