Cleaned up the look a little