Cleaned up a bit by making a const