finished video 25 and refactored my code