Some minor re-factoring updates