Added some color. Simplified even more.