Made code shorter