Code has been beautified