Code beautification done right