formatting on branch to match master