Cleaned up tool namespace