+ cleaning (old picture) & removing TODOs