Adding some captions and removing unnecessary stuff