global improvement

code style, links and import