Cleaned up images and image constants