Unify code style, align params