This looks a little better and saves a few operations