Made code smaller