Restructure for bulletproof-ness