Code beautified