Some beautification of code