Made code slightly better