Formatting a little better