Beautified source code again