Some beautifying work...