reformat code and made exports devenv friendly