Adding images and applying some code standard