Finished 1

Made the Code shorter