Some beautification