Make whitespaces consistent
Simplify overriding versions for CI builds