Attempting to make things a little more readable