Made code slightly less shameful