Minor cleanup

Minor cleanup and handle phantomjs returning null in some partially
loaded pages.
Minor: Correct png results
Revert "Minor: Correct png results"

This reverts commit 01cc8aae701a888cd6c5795602fea2a4a9519c93.
Revert "Minor cleanup"

This reverts commit d489564c030c38f783d8dcaa3a67c30ee451d43f.