moved ImageHandler
renamed a variable
renamed a variable to be more specific
edited a comment