clean up files + new image method for single responsibility