Made code less bulky.