Made the code smaller.