Code beautification