cosmetic code changes, to simplify toolchain switching
dependencies update