Improved scoreImage

Code cleanup, removed some todos, better comments, more concrete and
finalized approach