tidying & preparing for the pullrequest