Issue 417

Simple fix for this issue. Reduced some duplicate code at the same time.
This commented out image was in the existing codebase. Unsure of protocol for removing commented stuff, especially when I'm unsure of it's purpose.