[WIP] a bit of cleanup
[WIP] Extracts an ImageParser