Making this look a little bit better