Suggested code tidying.