Tidying up in github plugin