Made everything neater