Cleaned up tools