Refactor, remove Image class