Cleaned up the tools controller for preparation to add more tools.