Added background color
Cleaned up the code a bit