Refactor1

@ben-jones r?