Cleaned up tool portion