Add better source code beautification