formatting refactor
access key ok; small test refactor