Code cleanup
Tweaked images