Agree... maybe code-style corrections on merge is a little too soon :)