Made it more tidy

yay