added enhanced code-formatting