Fixed the mistake and shortened lines