Code cleanup in Image and Input
Hate these covers tags... [ci skip]