BZ-989519 first all internal dependencies then all external dependencies + code style (2 space idents)