Issue #275 Applying Code  Beautifier