Cleaned up pipes