Moved tools into separate class