Tweaked some styling for easier reading and simplified some stuff