Made the Code a bit nicer.